From 9411837b6cd7c4b2c4d994d511280cf266e18b8f Mon Sep 17 00:00:00 2001 From: Jyrki Gadinger Date: Wed, 22 Jan 2025 13:55:49 +0100 Subject: [PATCH] modify appimage build script to work with an EL8 base Signed-off-by: Jyrki Gadinger --- admin/linux/build-appimage.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/admin/linux/build-appimage.sh b/admin/linux/build-appimage.sh index 5fbd6c3d0..3619e3d82 100755 --- a/admin/linux/build-appimage.sh +++ b/admin/linux/build-appimage.sh @@ -20,6 +20,11 @@ if [ "$BUILD_UPDATER" != "OFF" ]; then BUILD_UPDATER=ON fi +# Ensure we use gcc-11 on RHEL-like systems +if [ -e "/opt/rh/gcc-toolset-11/enable" ]; then + source /opt/rh/gcc-toolset-11/enable +fi + mkdir /app # Build client @@ -42,11 +47,11 @@ DESTDIR=/app cmake --install . # Move stuff around cd /app -mv usr/lib/x86_64-linux-gnu/* usr/lib/ +[ -d usr/lib/x86_64-linux-gnu ] && mv usr/lib/x86_64-linux-gnu/* usr/lib/ mkdir usr/plugins -mv usr/lib/*sync_vfs_suffix.so usr/plugins -mv usr/lib/*sync_vfs_xattr.so usr/plugins +mv usr/lib64/*sync_vfs_suffix.so usr/plugins || mv usr/lib/*sync_vfs_suffix.so usr/plugins +mv usr/lib64/*sync_vfs_xattr.so usr/plugins || mv usr/lib/*sync_vfs_xattr.so usr/plugins rm -rf usr/lib/cmake rm -rf usr/include @@ -73,7 +78,7 @@ chmod a+x ${APPIMAGE_NAME} rm ./${APPIMAGE_NAME} cp -r ./squashfs-root ./linuxdeploy-squashfs-root -export LD_LIBRARY_PATH=/app/usr/lib:${QT_BASE_DIR}/lib:/usr/local/lib/x86_64-linux-gnu:/usr/local/lib:/usr/local/lib64 +export LD_LIBRARY_PATH=/app/usr/lib64:/app/usr/lib:${QT_BASE_DIR}/lib:/usr/local/lib/x86_64-linux-gnu:/usr/local/lib:/usr/local/lib64 ./linuxdeploy-squashfs-root/AppRun --desktop-file=${DESKTOP_FILE} --icon-file=usr/share/icons/hicolor/512x512/apps/Nextcloud.png --executable=usr/bin/${EXECUTABLE_NAME} --appdir=AppDir # Use linuxdeploy-plugin-qt to deploy qt dependencies -- 2.30.2